Fix compilation problems with xenstore.

Signed-off-by: Jerone Young <jyoung5@us.ibm.com>

diff --git a/tools/xenstore/xs_tdb_dump.c b/tools/xenstore/xs_tdb_dump.c
index a68f19fc2b271e994875d043d9611e296846eda3..f7e54fbe756fac34e4c17227a995ef97a7b9223a 100644 (file)
--- a/tools/xenstore/xs_tdb_dump.c
+++ b/tools/xenstore/xs_tdb_dump.c
@@ -53,17 +53,17 @@ int main(int argc, char *argv[])
                hdr = (void *)data.dptr;
                if (data.dsize < sizeof(*hdr))
                        fprintf(stderr, "%.*s: BAD truncated\n",
-                               key.dsize, key.dptr);
+                               (int)key.dsize, key.dptr);
                else if (data.dsize != total_size(hdr))
                        fprintf(stderr, "%.*s: BAD length %i for %i/%i/%i (%i)\n",
-                               key.dsize, key.dptr, data.dsize,
+                               (int)key.dsize, key.dptr, (int)data.dsize,
                                hdr->num_perms, hdr->datalen,
                                hdr->childlen, total_size(hdr));
                else {
                        unsigned int i;
                        char *p;
 
-                       printf("%.*s: ", key.dsize, key.dptr);
+                       printf("%.*s: ", (int)key.dsize, key.dptr);
                        for (i = 0; i < hdr->num_perms; i++)
                                printf("%s%c%i",
                                       i == 0 ? "" : ",",

diff --git a/tools/xenstore/xsls.c b/tools/xenstore/xsls.c
index f8cf24536a56f7386386d2f961d6ec1ab7570e99..781fc6d7a8d0c9a848beaf4002184328338bfbe8 100644 (file)
--- a/tools/xenstore/xsls.c
+++ b/tools/xenstore/xsls.c
@@ -8,7 +8,8 @@ void print_dir(struct xs_handle *h, char *path, int cur_depth)
 {
     char **e;
     char newpath[512], *val;
-    int num, i, len;
+    int i;
+    unsigned int num, len;
 
     e = xs_directory(h, NULL, path, &num);
     if (e == NULL)
@@ -25,7 +26,7 @@ void print_dir(struct xs_handle *h, char *path, int cur_depth)
         if (val == NULL)
             printf(":\n");
         else if ((unsigned)len > (151 - strlen(e[i])))
-            printf(" = \"%.*s...\"\n", 148 - strlen(e[i]), val);
+            printf(" = \"%.*s...\"\n", (int)(148 - strlen(e[i])), val);
         else
             printf(" = \"%s\"\n", val);
         free(val);